From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 12 May 2006 22:39:32 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~44206
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=18552b8f227bddf569dade5c69798a37839ea913;p=linux-4.9.git

Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NEIGH]: Fix IP-over-ATM and ARP interaction.
  [TG3]: ethtool always report port is TP.
---

18552b8f227bddf569dade5c69798a37839ea913